Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

zsnes: amend fortify3 patch and fix initialization #265039

Merged
merged 1 commit into from
Nov 2, 2023

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Nov 2, 2023

I was too eager fixing out-of-bounds access and did not notice that loop increment is += 4 instead of += 1. The loop condition was fine as is.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

I was too eager fixing out-of-bounds access and did not notice that
loop increment is `+= 4` instead of `+= 1`. The loop condition was fine
as is.
@trofi trofi mentioned this pull request Nov 2, 2023
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 2, 2023
@pbsds
Copy link
Member

pbsds commented Nov 2, 2023

And I was too eager to merge. Runs fine, and LGTM.
As i understand you have a long history as a prior committer. What is customary to do if the package maintainer is unresponsive? Wait a week? And would such a custom change during ZHF?

@trofi
Copy link
Contributor Author

trofi commented Nov 2, 2023

What is customary to do if the package maintainer is unresponsive? Wait a week? And would such a custom change during ZHF?

That's a great question! I don't think there is a strong consensus on that. Or even on what the maintainer's responsibilities exactly are.

My personal thoughts: I think the default maintainer's timeout of 1-2 weeks is very reasonable whether it's ZHF time or not. Gentoo has a similar guideline for non-maintainer commits.

Over time you might notice that some people don't review PRs for packages they maintain at all and you might want to expedite the changes for their packages. Ideally such defunct maintainer entries should be removed by maintainers themselves. In practice it's rarely done.

@pbsds
Copy link
Member

pbsds commented Nov 2, 2023

Thanks for your input. I've been thinking that a discussion about this on Discourse could be quite healthy. Different classes of contribution do call for different time frames to respond. Module additions, version bumps, major package changes, or small amends/fixups such as this pull are examples of changes that call for different review time frames. ZHF, staging(-next), and whether the fix is blocking other things are also a major modifiers to consider. Some may think any wait time may kill momentum, and an other problem I also see with such wait times is that a committer may review a PR and say "LGTM" before the time window has passed, then forget to come back later and merge it, seeing as we do not have a reminder bot configured.

I just had to talk myself into thinking fixups are fine to merge swiftly

@pbsds pbsds merged commit 942908f into NixOS:master Nov 2, 2023
@trofi trofi deleted the zsnes-fortify3-amend branch November 2, 2023 20:09
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants